From 8ea0a7bad0a8f6b72747d78dc66b2feed67d572b Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 7 Feb 2020 15:26:56 +0000 Subject: [PATCH] javadoc-optional Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gemeinsame Unterverzeichnisse: odk-old/config und odk/config. Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs. Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples. Gbp-Pq: Name javadoc-optional.diff --- Repository.mk | 2 +- configure.ac | Bin 466828 -> 467556 bytes odk/CustomTarget_check.mk | 2 +- odk/Module_odk.mk | 6 ++++-- odk/util/check.pl | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Repository.mk b/Repository.mk index 5b837ec5443..e447757bcb8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -863,7 +863,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\ offapi_idl \ udkapi_idl \ $(if $(ENABLE_JAVA), \ - odk_javadoc \ + $(if $(JAVADOC),odk_javadoc) \ odk_uno_loader_classes \ odk_unowinreg \ ) \ diff --git a/configure.ac b/configure.ac index 78d9a040b86dff6d24cfac0011b6e36232e813d3..0c41afdbd220d06eda5dc56c61db4e9f50a964c9 100644 GIT binary patch delta 551 zcmY*W&ubGw7-e?8-OR3OJV??iDcS6b^+%L66+|?Unt-@sS_ybiLWyRj)sP+%6+vym zLzJo%LVTy5dKVNSM1&}K>{Wyw1fllg!Sx@=I!V()2OjginfJaoeDkUs-TD??{>VPq zA;XmG*1gihQhD)Cu^C?pH(!4b1|Kcd=T8q$;l$XHz%Kb=u?cdd9(kJ`M$~48KD;x_ z&DBms%;c_`yMjwl!fa~KylSyyu|Z@pk=TjuC(R8Tq#wJrVq@KA5=wjB=I=N0=7pvi zZnbo~;?6CW?_=W=#Zc+-Yw(^h0q+k5_S%0fC{c8Jdd`s;%u4oU zT)yHwqc9p>eh6lP)U$g3PaafjZryaIZ%pTAvW9+lVK6Saxs{qbsP`!_%jkGwD8Ev; u>`0eorcFzZ)Vg5S=iREI?{_@&)CfF15W&VfRW#NZNvIN9dyNJDj{gULjIb8~ delta 198 zcmV;%06G8U#2k#j9DuX|vLlC6B>{(1B?7loB?F?`mreWw3zzLp0tuBM1W}cv1T&XI z{R0@4@&p){iRJ?mmmmQI9G5@=1Rs}r<^dF!z(52Fl}-c}msSA-4wtVP0}PYUIt7=% z0R$J9K<@z#m+S!qF_%3414);D0t7IZwgLnpm$2&t50~}=1TB|G_yG`?Ljwdo4oX2* zK}1hONmEBkL{CGP?8gQgm-+()8<(!}1qYW73kMd5Z3F~|Z3G2}Z3G6lZ3GAR9jdKC AyZ`_I diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index f0b63489f05..2d9d5ee6dcb 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ + $(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg)) diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 410f8cf8ef1..363a8a41dea 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ $(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\ CustomTarget_classes \ - CustomTarget_javadoc \ - GeneratedPackage_odk_javadoc \ GeneratedPackage_uno_loader_classes \ $(if $(filter WNT,$(OS)),Library_unowinreg) \ Package_unowinreg \ + $(if $(JAVADOC),\ + CustomTarget_javadoc \ + GeneratedPackage_odk_javadoc \ + ) \ )) endif diff --git a/odk/util/check.pl b/odk/util/check.pl index be03d40ff58..bed51e1c7a6 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -184,7 +184,7 @@ if (-d "$SdkDir") { # improvement required my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; - if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { + if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") { print "check java docu: "; if (check_dir("docs/java/ref")) { if (!check_file("docs/java/ref/index.html")) { -- 2.30.2